-
-
Notifications
You must be signed in to change notification settings - Fork 14.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[24.05] floorp: 11.13.2 -> 11.16.0 #336155
Merged
marcusramberg
merged 6 commits into
NixOS:release-24.05
from
LeSuisse:floorp-forgotten-backports
Aug 22, 2024
Merged
[24.05] floorp: 11.13.2 -> 11.16.0 #336155
marcusramberg
merged 6 commits into
NixOS:release-24.05
from
LeSuisse:floorp-forgotten-backports
Aug 22, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 15a8e38)
Release notes: https://blog.ablaze.one/4375/2024-06-00/ Git changelog: Floorp-Projects/Floorp@v11.13.3...v11.14.1 Signed-off-by: Christoph Heiss <[email protected]> (cherry picked from commit 8fc8814)
Floorp hardcodes /usr/bin/floorp as binary path when generating .desktop files for PWAs. That obviously not work for Nix-installed version, so patch it to just refer to "floorp", relying on $PATH. See also NixOS#314115. Signed-off-by: Christoph Heiss <[email protected]> (cherry picked from commit 116ee53)
Release notes: https://blog.ablaze.one/4397/2024-07-21/ Git changelog: Floorp-Projects/Floorp@v11.14.1...v11.15.0 Signed-off-by: Christoph Heiss <[email protected]> (cherry picked from commit e12df25)
Release notes: https://blog.ablaze.one/4415/2024-08-00/ Git changelog: Floorp-Projects/Floorp@v11.15.0...v11.16.0 Signed-off-by: Christoph Heiss <[email protected]> (cherry picked from commit d5f5a05)
LeSuisse
added
the
1.severity: security
Issues which raise a security issue, or PRs that fix one
label
Aug 20, 2024
ofborg
bot
added
10.rebuild-darwin: 0
This PR does not cause any packages to rebuild on Darwin
10.rebuild-linux: 1-10
10.rebuild-linux: 1
labels
Aug 20, 2024
christoph-heiss
approved these changes
Aug 20, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for backporting! Apologise from my side also, will act (again) more strictly in the future on this!
Compiled & tested my usual things, everything looks fine to me.
Result of nixpkgs-review pr 336155
run on x86_64-linux 1
3 packages built:
- floorp
- floorp-unwrapped
- floorp-unwrapped.debug
wegank
added
12.approvals: 1
This PR was reviewed and approved by one reputable person
12.approved-by: package-maintainer
This PR was reviewed and approved by a maintainer listed in the package
labels
Aug 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
1.severity: security
Issues which raise a security issue, or PRs that fix one
10.rebuild-darwin: 0
This PR does not cause any packages to rebuild on Darwin
10.rebuild-linux: 1-10
10.rebuild-linux: 1
12.approvals: 1
This PR was reviewed and approved by one reputable person
12.approved-by: package-maintainer
This PR was reviewed and approved by a maintainer listed in the package
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Backports of:
Flagged as security related because it appears to bump from Firefox ESR 115.12.0 to 115.15.0
so it at least includes the fixes for https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/
Not tested, I do not have enough compute right now to handle a whole Firefox build :/
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.